Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dev-infra): merge script should not always require full repo permissions #37718

Conversation

devversion
Copy link
Member

We recently added OAuth scope checking to the dev-infra Git client
and started leveraging it for the merge script. We set the repo scope
as required for running the merge script. We can loosen this requirement
as in the Angular org where the script is consumed, only pull requests on
public repositories are merged through the script.

This should help with reducing the risk with compromised tokens as no
access had to be granted on repo:invite, repo_deployment etc.

@devversion devversion added action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release area: dev-infra Issues related to Angular's own dev infra (build, test, CI, releasing) labels Jun 24, 2020
@ngbot ngbot bot modified the milestone: needsTriage Jun 24, 2020
@devversion devversion force-pushed the fix/dev-infra-require-only-public-repo-permission branch from 8841384 to 4dd510e Compare June 24, 2020 22:42
@devversion devversion requested a review from jelbourn June 24, 2020 22:42
…issions

We recently added OAuth scope checking to the dev-infra Git client
and started leveraging it for the merge script. We set the `repo` scope
as required for running the merge script. We can loosen this requirement
as in the Angular org where the script is consumed, only pull requests on
public repositories are merged through the script.

This should help with reducing the risk with compromised tokens as no
access had to be granted on `repo:invite`, `repo_deployment` etc.
@devversion devversion changed the title fix(dev-infra): merge script only requires public_repo write access fix(dev-infra): merge script should not always require full repo permissions Jun 24, 2020
@devversion devversion force-pushed the fix/dev-infra-require-only-public-repo-permission branch from 4dd510e to 0e3b2ed Compare June 24, 2020 22:43
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@devversion devversion marked this pull request as ready for review June 25, 2020 08:57
@devversion devversion self-assigned this Jun 25, 2020
@devversion devversion added action: merge The PR is ready for merge by the caretaker and removed action: review The PR is still awaiting reviews from at least one requested reviewer labels Jun 25, 2020
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just one more high level question I wanted to make sure we think through.

dev-infra/utils/config.ts Show resolved Hide resolved
@josephperrott josephperrott added action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews and removed action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews action: merge The PR is ready for merge by the caretaker labels Jun 25, 2020
@josephperrott
Copy link
Member

@devversion Removed the cleanup and merge labels, so that you can mark for merge once you are ready.

@devversion devversion added the action: merge The PR is ready for merge by the caretaker label Jun 26, 2020
@AndrewKushnir AndrewKushnir added target: major This PR is targeted for the next major release and removed target: patch This PR is targeted for the next patch release labels Jun 26, 2020
@AndrewKushnir
Copy link
Contributor

Hi @devversion, this PR had some conflicts with the patch branch, so I merged it to master only. Could you please create a new PR that targets a patch branch? Thank you.

drewswanner pushed a commit to drewswanner/angular that referenced this pull request Jun 29, 2020
* upstream/master: (861 commits)
  ci: decrease payload size limit for integration tests (angular#37784)
  fix(core): error when invoking callbacks registered via ViewRef.onDestroy (angular#37543)
  fix(core): don't consider inherited NG_ELEMENT_ID during DI (angular#37574)
  ci: decrease expected AIO and integration payload sizes (angular#36578) (angular#36578)
  fix(core): determine required DOMParser feature availability (angular#36578) (angular#36578)
  refactor(core): split inert strategies to separate classes (angular#36578) (angular#36578)
  fix(core): do not trigger CSP alert/report in Firefox and Chrome (angular#36578) (angular#36578)
  fix(language-service): incorrect autocomplete results on unknown symbol (angular#37518)
  docs: release notes for the v10.0.1 release
  ci: exclude "docs" commit type from minBodyLength commit message validation (angular#37764)
  feat(dev-infra): add support for minBodyLengthTypeExcludes to  commit-message validation (angular#37764)
  feat(platform-browser): Allow `sms`-URLs (angular#31463)
  refactor(core): throw more descriptive error message in case of invalid host element (angular#35916)
  build: move shims_for_IE to third_party directory (angular#37624)
  refactor(compiler-cli): Remove any cast for CompilerHost (angular#37079)
  fix(language-service): reinstate getExternalFiles() (angular#37750)
  docs: correct outdated dev instructions for public api golds (angular#37026)
  docs: add note about the month being zero-based in the Date constructor (angular#37770)
  fix(dev-infra): merge script should not always require full repo permissions (angular#37718)
  fix(dev-infra): support running scripts from within a detached head (angular#37737)
  ...
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Jul 27, 2020
profanis pushed a commit to profanis/angular that referenced this pull request Sep 5, 2020
…issions (angular#37718)

We recently added OAuth scope checking to the dev-infra Git client
and started leveraging it for the merge script. We set the `repo` scope
as required for running the merge script. We can loosen this requirement
as in the Angular org where the script is consumed, only pull requests on
public repositories are merged through the script.

This should help with reducing the risk with compromised tokens as no
access had to be granted on `repo:invite`, `repo_deployment` etc.

PR Close angular#37718
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker area: dev-infra Issues related to Angular's own dev infra (build, test, CI, releasing) cla: yes target: major This PR is targeted for the next major release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants